Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert Suspense cache Thenable.catch() change #22280

Merged
merged 8 commits into from
Sep 9, 2021
Merged

Revert Suspense cache Thenable.catch() change #22280

merged 8 commits into from
Sep 9, 2021

Conversation

bvaughn
Copy link
Contributor

@bvaughn bvaughn commented Sep 9, 2021 •
edited
Loading

Stacks on top of PR #22263 to avoid causing merge conflicts in hookNamesCache.js.

Compare the two branches only

Reverts part of #22275 (adding .catch() to Thenables in Suspense caches) in response to #22275 (comment).

After taking another look with fresh eyes, I think I see the "uncaught error" issue I initially noticed was here:

react/packages/react-devtools-shared/src/inspectedElementCache.js

Lines 178 to 195 in 8f96c6b

inspectElementMutableSource({
bridge,
element,
path: null,
rendererID: ((rendererID: any): number),
}).then(
([
inspectedElement: InspectedElementFrontend,
responseType: InspectedElementResponseType,
]) => {
if (responseType === 'full-data') {
startTransition(() => {
const [key, value] = createCacheSeed(element, inspectedElement);
refresh(key, value);
});
}
},
);

Brian Vaughn added 8 commits September 9, 2021 14:16
Added named hooks feature flag to DevToolsFeatureFlags
08c3fcb
Added new dynamic import suspense cache
06fab2d 
And used it to import named hooks code.

Note this commit currently breaks the test shell.
Added hookNames entrypoint to react-devtools-inline
b941b03 
And changed dynamic import() code to be passed in rather than embedded in the package
Removed named hooks prefetch step since we are using cached network r…
398dacd 
…esponses.
Added TODO to follow up on HookNamesModuleLoader param
f4c7df5 
Ideally we can remove this param once the Webpack 5 upgrade has finished.
Fixed incorrect path in dynamic import()
22d2eb2
Added instructions to react-devtools-inline README for new import() f…
7c8609d 
…actory function
Revert the .catch() around Thenables in DevTools Suspense cache
fd846f1 
Fixed the actual case of error which was in InspectedElementCache checkForUpdate().
@facebook-github-bot facebook-github-bot added CLA Signed React Core Team Opened by a member of the React Core Team labels Sep 9, 2021
@bvaughn bvaughn changed the title Added named hooks feature flag to DevToolsFeatureFlags Revert Suspense cache Thenable.catch() change Sep 9, 2021
jstejada
jstejada approved these changes Sep 9, 2021
View reviewed changes
Copy link
Contributor

@jstejada jstejada left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for following up on this, and submitting as a separate PR!

not a big deal, but since the original commit landed against main, wouldn't it be easier to land this revert on main directly, instead of stacking on top #22263? it seems like #22263 only has a simple change on hookNamesCache.js, so i wouldn't expect it to produce any significant merge conflicts, but idk.

in any case, not a big deal, up to you

regarding the changes themselves, so if inspecting the element fails, we don't really show anything in the UI? what does that look like currently?

After taking another look with fresh eyes, I think I see the "uncaught error" issue I initially noticed was here:

did you verify if the case you were seeing before shows up now reported as a console.error after these changes?

@bvaughn
Copy link
Contributor Author

bvaughn commented Sep 9, 2021 •
edited
Loading

not a big deal, but since the original commit landed against main, wouldn't it be easier to land this revert on main directly, instead of stacking on top #22263? it seems like #22263 only has a simple change on hookNamesCache.js, so i wouldn't expect it to produce any significant merge conflicts, but idk.

I can land #22263 first then this PR so they are separate.

regarding the changes themselves, so if inspecting the element fails, we don't really show anything in the UI? what does that look like currently?

It will show a red icon with a tooltip that the parsing failed.

did you verify if the case you were seeing before shows up now reported as a console.error after these changes?

Yup! At least it seemed to.

If we see another case where it's not handled, let's dig in and figure out how to fix it too 😄

@bvaughn bvaughn merged commit 96814e7 into facebook:main Sep 9, 2021
@bvaughn bvaughn deleted the devtools-suspense-cache-follow-up branch September 9, 2021 19:26
@jstejada jstejada mentioned this pull request Sep 15, 2021
Merged
zhengjitf pushed a commit to zhengjitf/react that referenced this pull request Apr 15, 2022
@zhengjitf
Revert Suspense cache Thenable.catch() change (facebook#22280)
ef7fd4e 
Reverts part of facebook#22275 (adding .catch() to Thenables in Suspense caches) in response to facebook#22275 (comment).

After taking another look with fresh eyes, I think I see the "uncaught error" issue I initially noticed was in checkForUpdate() (which did not pass an error handler to .then)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jstejada jstejada jstejada approved these changes

@gaearon gaearon Awaiting requested review from gaearon

@lunaruan lunaruan Awaiting requested review from lunaruan

Assignees
No one assigned
Labels
CLA Signed React Core Team Opened by a member of the React Core Team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bvaughn @jstejada @facebook-github-bot